Skip to content

[automated] Merge branch 'vs17.12' => 'vs17.14'#12134

Merged
GangWang01 merged 10 commits intovs17.14from
merge/vs17.12-to-vs17.14
Jul 10, 2025
Merged

[automated] Merge branch 'vs17.12' => 'vs17.14'#12134
GangWang01 merged 10 commits intovs17.14from
merge/vs17.12-to-vs17.14

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Jul 9, 2025

I detected changes in the vs17.12 branch which have not been merged yet to vs17.14. I'm a robot and am configured to help you automatically keep vs17.14 up to date, so I've opened this PR.

This PR merges commits made on vs17.12 by the following committers:

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout vs17.12
git pull --ff-only
git checkout vs17.14
git pull --ff-only
git merge --no-ff vs17.12

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.12-to-vs17.14
or if you are using SSH
git push git@github.com:dotnet/msbuild HEAD:merge/vs17.12-to-vs17.14

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/vs17.12-to-vs17.14'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/vs17.12-to-vs17.14 origin/vs17.14
git pull https://github.com/dotnet/msbuild merge/vs17.12-to-vs17.14
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.12-to-vs17.14
or if you are using SSH
git fetch
git checkout -b merge/vs17.12-to-vs17.14 origin/vs17.14
git pull git@github.com:dotnet/msbuild merge/vs17.12-to-vs17.14
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/msbuild HEAD:merge/vs17.12-to-vs17.14

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

dotnet-maestro bot and others added 8 commits June 13, 2025 09:08
* Update dependencies from https://github.com/dotnet/arcade build 20250610.3

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25264.2 -> To Version 8.0.0-beta.25310.3

* Update VersionPrefix to 17.11.35

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <v-gaw@microsoft.com>
* Add the switch running OptProf tasks

* Update VersionPrefix to 17.11.36

* Improve the display name of EnableOptProf

Co-authored-by: Rainer Sigwald <raines@microsoft.com>

---------

Co-authored-by: Rainer Sigwald <raines@microsoft.com>
* Update dependencies from https://github.com/dotnet/arcade build 20250625.4

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.25302.2 -> To Version 9.0.0-beta.25325.4

* Update VersionPrefix for vs17.12

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Nguyen Huu Linh <43189610+huulinhnguyen-dev@users.noreply.github.com>
* Update dependencies from https://github.com/dotnet/arcade build 20250626.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25310.3 -> To Version 8.0.0-beta.25326.1

* Update VersionPrefix for vs17.11

* Update VersionPrefix to 17.11.37

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Nguyen Huu Linh <43189610+huulinhnguyen-dev@users.noreply.github.com>
Co-authored-by: Gang Wang <v-gaw@microsoft.com>
…a collection (#12106)

* Override SkipApplyOptimizationData to true when disabling OptProf data collection

* Update VersionPrefix to 17.11.38
I detected changes in the vs17.11 branch which have not been merged yet
to vs17.12. I'm a robot and am configured to help you automatically keep
vs17.12 up to date, so I've opened this PR.

This PR merges commits made on vs17.11 by the following committers:

* @GangWang01
* @dotnet-maestro[bot]

## Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete
this PR by creating a merge commit, *not* a squash or rebase commit.

<img alt="merge button instructions"
src="https://i.imgur.com/GepcNJV.png" width="300" />

If this repo does not allow creating merge commits from the GitHub UI,
use command line instructions.

## Instructions for merging via command line

Run these commands to merge this pull request from the command line.

``` sh
git fetch
git checkout vs17.11
git pull --ff-only
git checkout vs17.12
git pull --ff-only
git merge --no-ff vs17.11

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.11-to-vs17.12
```

<details>
<summary>or if you are using SSH</summary>

```
git push git@github.com:dotnet/msbuild HEAD:merge/vs17.11-to-vs17.12
```

</details>


After PR checks are complete push the branch
```
git push
```

## Instructions for resolving conflicts

:warning: If there are merge conflicts, you will need to resolve them
manually before merging. You can do this [using GitHub][resolve-github]
or using the [command line][resolve-cli].

[resolve-github]:
https://help.github.com/articles/resolving-a-merge-conflict-on-github/
[resolve-cli]:
https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/

## Instructions for updating this pull request

Contributors to this repo have permission update this pull request by
pushing to the branch 'merge/vs17.11-to-vs17.12'. This can be done to
resolve conflicts or make other changes to this pull request before it
is merged.
The provided examples assume that the remote is named 'origin'. If you
have a different remote name, please replace 'origin' with the name of
your remote.

```
git fetch
git checkout -b merge/vs17.11-to-vs17.12 origin/vs17.12
git pull https://github.com/dotnet/msbuild merge/vs17.11-to-vs17.12
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.11-to-vs17.12
```

<details>
    <summary>or if you are using SSH</summary>

```
git fetch
git checkout -b merge/vs17.11-to-vs17.12 origin/vs17.12
git pull git@github.com:dotnet/msbuild merge/vs17.11-to-vs17.12
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/msbuild HEAD:merge/vs17.11-to-vs17.12
```

</details>

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or
issues.
Also, if this PR was generated incorrectly, help us fix it. See
https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.
@github-actions github-actions bot requested a review from a team as a code owner July 9, 2025 01:18
@GangWang01 GangWang01 merged commit 5d8159c into vs17.14 Jul 10, 2025
10 checks passed
@GangWang01 GangWang01 deleted the merge/vs17.12-to-vs17.14 branch July 10, 2025 01:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants